From f45dbbc55c139a6880081e6e0754f4dad8f414f5 Mon Sep 17 00:00:00 2001 From: tsteven4 Date: Sun, 8 Jul 2018 07:53:06 -0600 Subject: [PATCH] clang-tidy readability-delete-null-pointer formatted by hand. --- duplicate.cc | 8 ++------ kml.cc | 4 +--- main.cc | 4 +--- radius.cc | 6 ++---- 4 files changed, 6 insertions(+), 16 deletions(-) diff --git a/duplicate.cc b/duplicate.cc index 3fcbd8e40..f47c34094 100644 --- a/duplicate.cc +++ b/duplicate.cc @@ -196,9 +196,7 @@ void DuplicateFilter::process(void) btmp = addnode(sup_tree, newnode, &oldnode); if (btmp == nullptr) { - if (delwpt) { - delete delwpt; - } + delete delwpt; if (correct_coords && oldnode && oldnode->wpt) { oldnode->wpt->latitude = waypointp->latitude; oldnode->wpt->longitude = waypointp->longitude; @@ -219,9 +217,7 @@ void DuplicateFilter::process(void) } } - if (delwpt) { - delete delwpt; - } + delete delwpt; xfree(htable); if (sup_tree) { diff --git a/kml.cc b/kml.cc index 32d467fbe..6602f4f8e 100644 --- a/kml.cc +++ b/kml.cc @@ -448,9 +448,7 @@ void gx_trk_s(xg_string, const QXmlStreamAttributes*) gx_trk_head->rte_desc = wpt_tmp->description; } track_add_head(gx_trk_head); - if (gx_trk_times) { - delete gx_trk_times; - } + delete gx_trk_times; gx_trk_times = new QList; } diff --git a/main.cc b/main.cc index 57384b5d2..d466fc23d 100644 --- a/main.cc +++ b/main.cc @@ -700,9 +700,7 @@ main(int argc, char* argv[]) wpt = ivecs->position_ops.rd_position(&tracking_status); if (tracking_status.request_terminate) { - if (wpt) { - delete wpt; - } + delete wpt; break; } if (wpt) { diff --git a/radius.cc b/radius.cc index 6d47b06ee..17014d25a 100644 --- a/radius.cc +++ b/radius.cc @@ -156,7 +156,7 @@ void RadiusFilter::init() pos_dist = strtod(distopt, &fm); if ((*fm == 'k') || (*fm == 'K')) { - /* distance is kilometers, convert to feet */ + /* distance is kilometers, convert to miles */ pos_dist *= .6214; } } @@ -179,9 +179,7 @@ void RadiusFilter::init() void RadiusFilter::deinit() { - if (home_pos) { - delete home_pos; - } + delete home_pos; } #endif // FILTERS_ENABLED -- 2.30.2